From 2a509180a352dca7d4ed48b5616dc7de0b0a6355 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 21 Jan 2003 02:44:28 +0000 Subject: [PATCH] Add/finish setshort_mustuniq. Fixes holux in testsuite runs. --- gpsbabel/defs.h | 1 + gpsbabel/holux.c | 1 + gpsbabel/mkshort.c | 13 ++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 60a4aeb7f..f836cec31 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -189,6 +189,7 @@ void *mkshort_new_handle(void); void setshort_length(void *, int n); void setshort_badchars(void *, const char *); void setshort_mustupper(void *, int n); +void setshort_mustuniq(void *, int n); void setshort_whitespace_ok(void *, int n); typedef struct ff_vecs { diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c index 021821551..1f2bd4c7d 100644 --- a/gpsbabel/holux.c +++ b/gpsbabel/holux.c @@ -161,6 +161,7 @@ char *mknshort (char *stIn,unsigned int sLen) return NULL; setshort_length(mkshort_handle, sLen); + setshort_mustuniq(mkshort_handle, 0); strcpy(strTmp,mkshort(mkshort_handle, stIn)); memset(strOut,' ', MAX_STRINGLEN); diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c index 958b52bb2..9abf9e09c 100644 --- a/gpsbabel/mkshort.c +++ b/gpsbabel/mkshort.c @@ -88,11 +88,6 @@ mkshort_add_to_list(mkshort_handle *h, char *name) return name; } -void * -mkshort_is_unique() -{ -} - void * mkshort_del_handle(void *h) { @@ -186,6 +181,14 @@ setshort_mustupper(void *h, int i) hdl->mustupper = i; } +void +setshort_mustuniq(void *h, int i) +{ + mkshort_handle *hdl = h; + hdl->must_uniq = i; +} + + char * mkshort(void *h, const char *istring) { -- 2.30.2